This repository was archived by the owner on Dec 15, 2022. It is now read-only.
open Git pane when merge conflicts are present#1709
Merged
annthurium merged 2 commits intomasterfrom Sep 28, 2018
Merged
Conversation
annthurium
commented
Sep 27, 2018
| notificationManager={notificationManager} | ||
| tooltips={tooltips} | ||
| confirm={confirm} | ||
| toggleGitTab={() => {}} |
Author
There was a problem hiding this comment.
I noticed that there were some console warnings about these missing props, when I ran the unit tests.
It's so easy to miss these kinds of warnings, because running the full suite takes so long that I don't usually do it. :-( I don't know what to do about that though.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of the Change
When I was working on #1704, I noticed
ensureGitTabVisibleis never called.Doing a bit of code archaeology, it looks like we used to pop open the git tab automatically when merge conflicts were present. I don't think we intentionally removed this functionality, so let's bring it back.
My reasons for wanting to revive this functionality are anecdotal: an old coworker of mine discovered the git tab because it popped open when there were merge conflicts.
Alternate Designs
none considered.
Benefits
Users can resolve merge conflicts more easily within Atom since the git tab is already open. It might improve discoverability of the git tab by showing it to the user at an opportune moment.
Possible Drawbacks
Users who don't want to resolve their merge conflicts in Atom might be annoyed about the git pane opening.
Applicable Issues
#1705
Metrics
Instrumenting when the git tab opens doesn't tell us much, since we're doing that automatically. I'm curious if users are using the git tab after it's open, but we don't have "funnel" instrumentation that easily allows us to track which actions were taken immediately before. Thus, I'm not adding any metrics instrumentation to this pull request.
Tests
ensureGitTabPresentis called when merge conflicts are present.